From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 28 May 2003 08:30:36 +0000 (+0000)
Subject: fixed edit conflict bug
X-Git-Tag: 1.1.0~508
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=15656c813e072ca9bd6f780566bcc1008ca39944;p=lhc%2Fweb%2Fwiklou.git

fixed edit conflict bug
---

diff --git a/includes/Article.php b/includes/Article.php
index 282e55d841..996ef23ea5 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -433,7 +433,7 @@ class Article {
 
 		if ( "initial" == $formtype ) {
 			$wpEdittime = $this->getTimestamp();
-			$wpTextbox1 = $this->getContent();
+			$wpTextbox1 = $this->getContent(true);
 			$wpSummary = "";
 		}
 		$wgOut->setRobotpolicy( "noindex,nofollow" );
@@ -446,7 +446,7 @@ class Article {
 			$wgOut->addHTML( wfMsg( "explainconflict" ) );
 
 			$wpTextbox2 = $wpTextbox1;
-			$wpTextbox1 = $this->getContent();
+			$wpTextbox1 = $this->getContent(true);
 			$wpEdittime = $this->getTimestamp();
 		} else {
 			$s = str_replace( "$1", $wgTitle->getPrefixedText(),